Merge branch 'deb/emacs22/d/sid/upstream' into deb/emacs22/d/sid/master
authorRob Browning <rlb@defaultvalue.org>
Wed, 26 Mar 2008 13:51:10 +0000 (08:51 -0500)
committerRob Browning <rlb@defaultvalue.org>
Wed, 26 Mar 2008 13:51:10 +0000 (08:51 -0500)
commit9fb0f6d23252111c12de7ffa37039330fa6839cd
tree1524c3b9b0c6dbbddec26761819c169521f9f51d
parent72794532a4c9365f0875797e905fe6f95813dc22
parent5951f9a8329bdf66bffb9e2efe49a5d60c67fdc6
Merge branch 'deb/emacs22/d/sid/upstream' into deb/emacs22/d/sid/master